How To Resolve Conflicts